Inspect refactoring to fit new architecture