Added forgotten classes to last commit