Refactoring for boolean and char
continue mapping