Added mappings for everything