Refactoring to 3.1 version
Refactoring to 3.1 version