Remove ugliness of uri scheme concatentation and use OOP !!!