Update to support fork