Added ubiquity and poller classes.