Output and Context B updated to new Dsl