Updated specs, spec structure, factories, and models