Added a simple parser