OPAL-2018: Changing Data database to database