CLSN-1669 : BTD should be in base and not derived