Removed Logging, added Enum