Fixed data stuff to not redefine database.