Code Refactoring and .25 compatibility