Replaced with Map return type instead HashMap