Updated mappings and options.