just adding some scoping to Database