Add support for names and descriptions