Restructure model inheritance with mixins; new unit tests for comments