Making use of new documentation.