Reodered class for Selta Polling