Changes towards ComicBook model encapsulation