Continue implementing update mode support