Feature/improve configs

[skip ci]