Added more cases to parse