Added long & decimal fields