Improve the spec