Update for appropriate API details on encoding