Fixed property name and missing properties added (fixes #674)