Configuration check added