Reworked internals