Reduce configuration dependence and documentation enhancement