Replace Type Code with Subclasses