Finish REST implementation