Adding missing Override annotations and specifying DataFormat class when...

... accessing it's static members.