Make specs more explicit