Added decorator classes