Added translator, fixed namespaces.