Re-add option to set context manually