Added supported protocol; code cleanup