Additions to database classes