Moved mappings to file type plugin
Merged with latest