Replace sepate functions with conversion argument