Modified added the basic parsing