Updated user and Cedar templates