Added version handling functionality