WINDUP-121: Remove interface/implementation split from Service classes
Merge pull request #135 from jsight/WINDUP-121

WINDUP-121: Remove interface/implementation split from Service classes
WINDUP-123: Support Maps as adjacent vertices
Merge pull request #136 from jsight/WINDUP-123

WINDUP-123: Support Maps as adjacent vertices