Added Config support