Putting Services and Foreign Direct Investment with Endogenous Productivity Effects in Computable General Equilibrium Models