Updated composer and templating