Adding auto-configure capability