Modified Protocol class and all affected classes