Add functionality in resolver code, add test