Added changes for multiple protocols + cleanup