Made more generic by removing specific version references

Tweaked a little bit to provide examples.

Squashed commits into 1, while hoping not to break anything