Jcs update mappings

@srkirkland Can you review and merge if it looks ok to you?