Updated templates and added some concat, connect and watch