PersonFed refactoring