Refactoring, fixed a merge mistake
Less runtime reflection