Adding template types where they were left out.
From and to can now use different types.