Refactor to AOL ID