Refactor EnumSubKey