Refine enum management