Add extra information in Metadata

JAVA-179 #fixes