Removed multiple return value and used hash