Add partial UUID support