Current documentation seems a bit complicated and does not cover for our recent features. Let's improve it.