Added support for transporters and bunker