Adding logic to use dksubs if available