Include properties in count