More refactoring of persons_engine