Add mapping for keywords
Remove is_static, partially remove is_default impact