Added backup mechanism