merge my REST API changes with Sapan's