12 Merge Rollback class into Hydrator one