convert model to use PropertySet