Manage Plans reimplementation