configuration now in models
Updated models and analysis