Reorganised the property type list a bit