[TASK] Improve config