Added some templates and updates

Signed-off-by: haydar9 <haydar.iss4@gmail.com>