Added support for name and description