Contact and User models refactoring