Added the data classes for filesystem access