Adding support for long descriptions