More mappings

Still have to do item ids