Updates to work with new cfg namespace