Added new schema structure for the related modifications II