Start separating structure handling from model instance