Major updates for production