Applied changes for DB abstraction

Change-Id: I977d90ec54f4a26dd27c6419b41deb31ecc0d3ac
Signed-off-by: Matthias Steiner <matthias.steiner@inscope.net>