Refactor and update ghost list