Put back into URL namespace, use feature detection