Add types and categories