Better version and commit collection