Updated System Classes