Added portion missing from last commit
Adjusted generics for ActionThreads