Refactor setting whiteList