Database shenanigans have been added and don't break anything