Added integer support