Try to add support for create and remove
Sync up batch (not working now)