Updated for current api/status