Ported some more classes