Spec support reorganized