BZ-10600: map directive usage changes

Signed-off-by: Paden <padenportillo@gmail.com>