Make database optional

I am trying to port ISS3 to 1.7, but do you actually need 1.7 here? PS is still 1.6.