Sync changes from Base