Moved data out to a model layer.