Added constructor and more property mapping.