Added last key word and empty expressions