Added more parse logic