Added synonym support, added documentation