Include properties when parsing as well