Procedures & model: Updated procedures for model handling