Better version handling.