Added variable option for specifying mappings

Simple change, and maintains default behavior when they aren't specified.