Data documentation, Metadata re-implmentation.
Checkstyle fix.