Towards getting the old REST API working again