[TASK] Made category selection optional and added FeUser support