Adding proper namespaces to make it easier to include what's needed
Using correct namespaces in doc and including field docs