Add models and fixed controllers