Added a basic parser