Improve mapping of ac items