Doc modification
Tags support check
Doc update