Updating some views and models for compatibility