Switch to using _.data