Plan model and other minor changes