Add the whole structure.Fix the activities due to runtime error