Change keywords and add Mapping