Still working on new static field + some code refactoring.