Refactor sequencing to include context name