Added synonym support.