Make more things introspectable