Added all of the decorator classes