split activityprovider in two