Spec improvements