added nested fields for master lists and master steps