Use a UUID instead of a constant value