Add support for container title and description