Refactored enum Shape