Added object property parsing