Added resolution context to aid in debugging