Added quad and polygon support for the model class