Add more classes, unused for now