improving Strategy classes