Refactoring - adding new entity for contact