More refactoring towards common reflection API