Updated version handling