Added support for descriptions