Improve Spec template