Refactor Externals