SugarEPS 3.0.1 refactoring