Implemented short polling solution