Change structure, added specs