Refactoring for 4.2 build;