Database Structure change. Getting ready for GoalTree