Extract Features controller out of Main controller