Adds config class, refactors ModelAdditions