Add support for property types