Error handling imrpoved
Iterator tag
Reworking logic of package selection