Added appropriate code for the Unicast to work.

Untested.