Bug Fixes
Recursion in entity introspection