More refactorings, version param validation