Move implementation out of spec