Made a few updates to Enum types and file imports.