Added appropriate protocol support to classes.