More reflection refactoring