Added curved shapes