Re-integrate status API into API structure