Added resolution of default types in default dependency resolver, improved API