Used new scoping resolver