Adding data store layer