Added a few more implementation in parser