Database access now configurable and not static