Few enhancement in the datatyping