Update to support version 6.1