Remove usage of generics from Work