Added classes for data storing