Move drain stuff to new DrainSupport interface