Breaking eggs (model) for better lifecycle and persistence support