Added EggHandler package