Added references to speed up the parser