Aded new parser
New parser implemented