Adding name, description, and meta elements into categories.
Imprivements in annotations