using new macro name and no more dependencies (read automagically from manifests).