Add features for conditional linking