Add ExternalDB annotation back