Corrected base models and routes