HOTFIX - Categories are decoupled now