Rearrange features

1) move monkey patching to the point when it is actually needed
2) do not require adapters unless they are needed