Modify structure for createplan branch