Database is now optional.