Improving Contact entity with bean and address