Updated for latest forge