Added compare and set context