Improve specs