Merge pull request #209 from smashwilson/map-no-more

Provide structs for server creation and update