Add annotations to introspection