Update to include scheme check