Converted a few more classes