Configuration more _best practice compliant_