Add some more introspection functions