Added new references, Moved parse()