Improved support detection