Module models

Requires feature/dashboard-model to be merged