Added impl and test for constraints
Added test for batch operations