Make POIs optional in models, move logic out of tasks.

2 jobs for refactor_model