Added tags to handle Unit and Gang dependencies.