Switched to better API responses