Add more statics to globals in library