Added some random parser stuff