Integrated feature properly