Refactored properties and added pollingInterval as property