added more parsing capabilities