Adding Remaining Templates