Refactored the loading of persons