Added transformation of endpoints.