New data access options for batch
Refactoring
Drag and drop tests