Added more parsing to convert from Java based structures into Scala structures