Replacing hard dependency