Added some cases to Parser