added bulk support untested