Update implementation to reflect IMG-13 changes.