Add some feature detection