More flexible linking. Changed directive name.