Categories Manager re-implemented