adding new classes  for new buffer system & propagating changes