Ported some more methods