Add changes for Revolt