Added more mappings to the class metadata factory