Moved some more methods