Added NullObjects and refactor poll notifier