Update for new SPEC