Improve spec