Added support for unit hijacking