[MAGEMEP-114] Improve settings management