More refactoring for reflection management