2) might be worthing looking at how expectations are done right now. those do have an info object which contains the expectations definition and the solid instance