Add shapes to scenarios