Changed Database to fix potential problems