Changed default strategy to polling