Javeriak dev

Changes for Metadata support