Added $baseConfig argument to ConfigFileStorage and ConfigFileReaderInterface