Added Config integration