As part of the improvement of calibration techniques of in vivo counting, the Laboratory of Internal Dose Assessment of the Institute of Radiological Protection and Nuclear Safety has developed a computer tool, 'OEDIPE', to model internal contamination, to simulate in vivo counting and to calculate internal dose. The first version of this software could model sources located in a single organ. As the distribution of the contamination evolves from the time of intake according to the biokinetics of the radionuclide, a new facility has been added to the software first to allow complex heterogeneous source modelling and then to automatically integrate the distribution of the contamination in the different tissues estimated by biokinetic calculation at any time since the intake. These new developments give the opportunity to study the influence of the biokinetics on the in vivo counting, leading to a better assessment of the calibration factors and the corresponding uncertainties.