#22 - Handle same enum mapping as immutable class