#26 Upgraded DependecyResolver