Simplify initial and model structure handling