Use reorganized REST API