Changes to make bulk operation working on hsql