Sync with BA changes