Update to support better pluggable backend