Spec Improvements