Add support for specific version via attribute

Some minor stuff to support providing a specific version via an attribute. Works in my environment, but could always do with further testing.