Got rid of separate mappings for enums and fixed Value converters and null source