enhance dependency management.
fix enabling of interceptor