Moved more depends into imports