Refactoring ShapewaysConnection