Added synonym support. Made interface prettier.