Config support added