Added integer and number decode support