Add other needed classes