Moved initialization code into parser