Adapted and generalised models

Summary
Adapted and generalised models