Adding both quality and functional scenarios