Updated for removed interface