Added Plan base class