added more property parsing