Added many more Sahi identifiers