Started reworking on version_comparison_key handling