Supports SRG names. Hacky!
Removed some unused constants.