Added backward compatibility and minor docs fix.