Adding inline collision detection and rollback support