New documentation for 2.5