Profile service refactoring

changes for AtomEntity