Private for maintainers