Change objects structure. Made static fields non static.