Our dev team has created a Schema from Scratch where we have given more customization options to merchants to add information. Also added more validations to make sure that the information passed was correct.