start refactoring from forge 1.3