Several modifications regarding importing dependencies