Add support for descriptions