Added remaining mappings

.