Dependency update
Implement ContainerAwareTrait
Cleanup from inspector