Refactoring to eliminate deprecated introspection methods