Added strong decision makers
Changed classes to be compatible with the spec