Refactored Protocol Service and Dao to support Generics