Add rollback feature to DMO
General cleanup