Comments added to system classes