Further steps to proper UUID support