PublicAPI support