Restructured statics
Merged statics changes