CARE #44: Added all computed fields to database