Improved description of endpoints