Renamed MappingReader to MetadataReader
Cleaned adapters definition