More advanced synonym handling