Added missed resolver calls