Refactor remaining classes to use AccountService instead of WPAccount