Added ubiquity database classes