Some more methods and classes ported