Added support for description