adding raw metadata support