Used generics - remove lint warnings