moved handler resolvement to DependencyResolver
minor refactorings