Support unprefixed APIs