Updated functionality for quickstart