Remove redundant admin field
Add comment field to the docs
Validate max length of the strings
UI update