Complete before DB

Change-Id: I87bbbbf0e5c877e3ab6052c8026eeb581fedece6
Signed-off-by: guaraniz <damyan_rusinov@abv.bg>