Added integer and float parsing