Add support for specifying version