Changed to an enumset for output options for greater flexibility