Fixed vendors + added bundles