Adapting sfdc to use the new modifications/additions in commons: builder and the DataType(INTEGER and DOUBLE)