Refactoring EPerson & collection