Needed classes added for test deploy.