Added remaining specs