Should this be in atlas-model or atlas itself?