Added more property mapping