Async activity add/delete + fix to entitities