Better statics structure
Better statics structure