No, the Madrid Agreement does not allow for broadening the list of goods or adding more classes to the application. The mark filed in other countries must be identical to the basic mark.