Updating to support version 2.1