Updated for the database