[FIX] Update for DatabaseFunc