No more need for a model prop