Updated to apply to all classes