Updated data controller