Moved to refactored reflection