Rewrite versions methods properly