More spec support