[~TASK] Improved controller config