Add UUIDs to resources and validations