Changed Parser to rely on ListParser