Added missing shape definitions