Moved more methods