Tweak internal changes to backend function