More fixes to plans, restructuring, addition of metadata