Added needed classes