Adjust object models, add step branching