Working toward an object oriented domain model. Introduced file data providers.