Update for React changes