Quick Start related changes