Many changes so as we do not break last api with the multiple feature implementation