Added new headers
Fixed Object::ToString