Update for ast changes