Minimal cleanup
Added uuid to message
Receipt is now replacing Future