Add Enum to base module and cleanup travail imports.