Finish REST v2 implementation