Code refactor - statics. Fix resources