Changes to use a mapping object to determine the selected job