Improve specification