Changed shapes from Strings to enums.