Changes to handle scheming