Safer master API OK