Added "using" blocks to simplify out the type variables