Refactor forge support - closes #318