Refactor to allow override of server registration
Get nested docs working with defaults