Added support for descriptions!