Changing the db type to be independent would be nice here.