Add back some models and views