Update to new doc format