Upgrade to sufia-models 4.0.0