Fix bug with old models and helpers