updated some stuff to uuid to utilize uuid in citadel