Created separate sections for taint tags and storage