Adding data store wrapper
Refactoring to make JQLite compatible