Replace removed functions