Replace deprecated interface to new one