Refactor license selector