Move UpdateAttribute into query model