Prepping for more metadata in Jav Ananlysis