7.x - better documentation