Refactored the Contact Entity