Description and extendability improvements.