Added scaffold for basket