Updates to the system framework