Pulled generic parameters to own file for include. Added Async generated methods.