Add namespace, and checking for all strategies