Created additional pkgs for strategy pattern