Doc enhancements