Updates to use guid.