Added end context in ByVerse mode