System class added