Update SPA scenario
Added more updates