Remove m2m from protocol and add foreign key to topic