-Refactoring
-Fixed serializing static fields