Added more types for introspection