Reworked System internals