Improved doc and validators