Change exposed API to be non enumerable