Updated Egg model and endpoints