Add detection of scheme