Security(lfi & rfi) and performance fix.