Latest update for database implementation