tweaking schema and removing roo using push in refactor