First step to get rid of type unsafe functions