more updates to be compliant with GraphX