Updates to support resolution