Updated to newer forge (fixed mappings)