Testing viable way to add UUID support