Use only natural language keys (Fix #350)