Update spec format (still needs tests)