Moved some mappings to their old places