Added some introspection