Update for base 4.7