Using UUID instead of ID and adding a FIXME to fix tcp later.