Changed behavior from @Push to Poll Interval