added forge converter, and small refactoring