Added ability to have resolved ops