Moved data store out of module