Added even more classes