Refactored ForgeEventHandler and Overlay