Major rework of System and Term