Update for SevenCommons