Add additional mappings & settings