Enhance default strategy