Added fishing handler, fixed missing getOverrideKey