Better use of property types

Refs #10064