Code refactoring before new features.
Add support for new private static field.