Added more mappings.

Need to check the primary key part, it was not added yet. But I will first complete the rest.