Made CATEGORY an optional dependency.