Update for compatibility