[#1403] Use Configuration wrapper