Property parsing and dumping added