Added in the rest of the mappings