No more automagic in models