US #58 Refactor to add introspector