Removed protocol definition out of class - now universal