Made iterator external option and added label iterator type