more spec changes and join table changes