New uml
Merge pull request #251 from pachalad/noMockServer

New uml