Continued 'Popular' API Refactor