Added from internals