Changes related with tagging and bundles refactoring #2