We should do this to modernize it before merging the 0.7 branch
We should do this to modernize it before merging the 0.7 branch