Improve composer template definition