Hg 73 store namespace data

@kenkouot 
@kenkouot I put it at the end so it can be optional and I didn't have to refactor wherever else it's used, should I still put it at the beginning?