Reorganized internals