Switched from REST to OSAPI