Better version management