Do some refactory and change numeric primitives for objects