Make base agnostic