Removed polymodels dependency