Intro refactoring updates