Updated with database