Initial code update to support current rust version