Better version tracking