Added scaffold