Separated classes, addons, and factories