Added classes to the data store