refactoring to 2.x support