Removed hardcoding in Address