Updated to new database