Removed Enum depedency