Added some identifiers to a few types