new spec files, minor syntax changes in the models