Added more parsing functionality