Security/API (beta) improvements