Added more parsing