Some changes to Protocol classes