Updated protocol and added protocol templating