Fixed includes
Added PollingManager
Started changes polling