[PATCH 2/3] Added remediation template