Added ability to specify protocol name separately