Feature detection out of main file