Case Type refactoring