add context and commit related changes