Re-added Adam's work on Identifiers