Refine enrollment process and queue list