Specs improvements