Making xgmml parser more flexiable