Issue #130 - URL type rework, compatibility with api version 2.1 added, unittest added, integration test added