Updated description and base template