Update for cleanup and role security