Model/View refactor for dot generation