__Map for BZ-497