Fix DataFixtures & add Comment data