Static objects code refactored.