updated completion mappings