Improve + add conf