little change so all databases are supported