Some static methods and variables are moved under namespace