Replace the deprecated stuff