Added support of rollbacks