[misc] Improve configuration