Bring inline with DKOSP