Refactored Class Types