Modified setup to source from versions