Further database classes added