added more parsing capability
added more parsing capability