adding support for contractor mapping