Update for encoder changes