Added more moves to parser and listener