Updated basefields