First step of integration with features