Added sections and statics everywhere