[2130] refactor feature and product composition to meet update requ's