Feature detection added