Make use of new enum