Add keywords and mappings