Added decimal support