More hacks for A+ service integration