Added MC, MT, and Pipe shapes