Updated to support UUID's

Needs to be tested