Updated actor to be generics
Updated action to be generics