Spec enhancements