Finish bdd restrict and update function simplification