Rollback previous changes and added private ESI generation management