Added more primitive identifiers.