Refactor to pull up dependencies