Add ExternalAddActivity and break out InternalAddActivity